git rebase vs merge

join shbcf.ru